bitkeeper revision 1.1159.258.87 (424d8879K9lhGxxSZd9bVE9LZZ2YDw)

Fix page scrubbing when fewer than 16 pages remain in the scrub list.
Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c
index b143eba8bc8c7a2fffc259bb993c1c774c0c2649..dc5b70c8438a35eafbab6ca4ceb47e2985b9b12b 100644 (file)
--- a/xen/common/page_alloc.c
+++ b/xen/common/page_alloc.c
@@ -651,8 +651,11 @@ static void page_scrub_softirq(void)
         
         /* Peel up to 16 pages from the list. */
         for ( i = 0; i < 16; i++ )
-            if ( (ent = ent->next) == &page_scrub_list )
+        {
+            if ( ent->next == &page_scrub_list )
                 break;
+            ent = ent->next;
+        }
         
         /* Remove peeled pages from the list. */
         ent->next->prev = &page_scrub_list;